From: Ryan Kaldari <kaldari@users.mediawiki.org>
Date: Tue, 15 Mar 2011 01:57:37 +0000 (+0000)
Subject: keep double slash filter from breaking absolute URLs, fix to r83902
X-Git-Tag: 1.31.0-rc.0~31400
X-Git-Url: http://git.cyclocoop.org/%28%5B%5E/404?a=commitdiff_plain;h=754e09b59b6b72144999a96953e11815ebe75fd3;p=lhc%2Fweb%2Fwiklou.git

keep double slash filter from breaking absolute URLs, fix to r83902
---

diff --git a/includes/libs/CSSMin.php b/includes/libs/CSSMin.php
index d5a3a2df7a..78ea564180 100644
--- a/includes/libs/CSSMin.php
+++ b/includes/libs/CSSMin.php
@@ -146,7 +146,7 @@ class CSSMin {
 			$file = "{$local}/{$match['file'][0]}";
 			// bug 27052 - Guard against double slashes, because foo//../bar
 			// apparently resolves to foo/bar on (some?) clients
-			$url = preg_replace( '#//+#', '/', $url );
+			$url = preg_replace( '#[^:]//+#', '/', $url );
 			$replacement = false;
 			if ( $local !== false && file_exists( $file ) ) {
 				// Add version parameter as a time-stamp in ISO 8601 format,